Merge from emacs-24; up to r108032
authorChong Yidong <cyd@gnu.org>
Sun, 10 Jun 2012 13:21:29 +0000 (21:21 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 10 Jun 2012 13:21:29 +0000 (21:21 +0800)

Trivial merge